dgit.raspbian.org Git - cargo.git/commit

projects / cargo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: b17b5d7) | patch

author	Alex Crichton <alex@alexcrichton.com>
	Wed, 30 Jul 2014 19:43:29 +0000 (12:43 -0700)
committer	Alex Crichton <alex@alexcrichton.com>
	Thu, 31 Jul 2014 17:16:03 +0000 (10:16 -0700)
commit	3b77b2c76351da96c17d62e311becdd7615732fb
tree	0f84207eaea60df00621a573567a425c3b30ee63	tree \| snapshot
parent	b17b5d7203198b0f3aa070db21fbffd1cb5bb93d	commit \| diff

Fix all tests and rebase conflicts

This rebases the lockfile branch to master and updates all code necessary to get
the tests passing again.

19 files changed:

README.md		diff \| blob \| history
src/bin/cargo-generate-lockfile.rs		diff \| blob \| history
src/bin/cargo-run.rs		diff \| blob \| history
src/cargo/core/dependency.rs		diff \| blob \| history
src/cargo/core/package.rs		diff \| blob \| history
src/cargo/core/registry.rs		diff \| blob \| history
src/cargo/core/resolver.rs		diff \| blob \| history
src/cargo/core/source.rs		diff \| blob \| history
src/cargo/ops/cargo_compile.rs		diff \| blob \| history
src/cargo/ops/cargo_generate_lockfile.rs		diff \| blob \| history
src/cargo/ops/cargo_rustc/fingerprint.rs		diff \| blob \| history
src/cargo/ops/mod.rs		diff \| blob \| history
src/cargo/sources/git/source.rs		diff \| blob \| history
src/cargo/sources/mod.rs		diff \| blob \| history
src/cargo/sources/path.rs		diff \| blob \| history
src/cargo/sources/registry.rs	[new file with mode: 0644]	blob
src/cargo/util/graph.rs		diff \| blob \| history
tests/test_cargo_compile_git_deps.rs		diff \| blob \| history
tests/tests.rs		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.